WIP

Some minor changes I am still currently working on