Fixed stuff, added features

Description goes here