fixed some things, some things still borked