Small fixes

pushed it now because I need to re-fork my fork lol