Bugfix

Bug fixes, clicking works better