Initial commit
Minor fixes to the tmp code