random updates, works better now