Misc fixes and start of Race class