fixed more stuff, lookign pretty good at this stage