fixed update, made draw better
see above
see above