about to merge a lot of shit here
more changes