Github mangled the last commit, manually fixed it but may be some overlooked problems.