Some small fixes and changes after the last large commit

- Removed uneeded code
- Simplified some functionality
- Updated project description with features and demo URL