some random updates, drawing still messed up