Minor bugfixes and an awesome feature ;)