and some new shit anfd fixes and stuff