Added new stuff, fixed bugs