Tried to change the sensible things phikal mentioned in his comments to the last commit