more updates and stuff
forgot the comments