bugfixes and plist added