Some minor changes, nothing to big. Rebased the entire repo due to not being able to auto merge anymore just makes everything easier.