Bugfix (few lines for mouse / deleted by accident) +clean