updates and fixes
fuck it alllll