Git messed up some things - hopefully fixed