Cleaned up a few things

Maybe you can close some of the issues now :+1: