styleing, fixes and stuff