And some more features + bug fixing

*NOT TESTED*