reworked a lot of stuff