New features

Added a lot of new features, see the updated readme for a description of them.