A backup sorta commit
A few minor fixes