Bug fixes and improvements;

For developers:
The code is now fully (almost) refactored - you can look at github repository to see, how easily plugins can be made with Kotlin