Better discription, Bugfixes