cleaned up lots of shit