A few bug fixes and a few more features, next I need to document everything