Fixed a few Bugs and added more features