Bug fixes & improvements ;)