bugfixes, draw now functions properly