added more Stuff and fixed some style issues