Draw + bugfixes