bugfix + cleaning + initial mouse input