Bugfixes and added Description