Cleaning up errors and stupid Github commit mess