Fixed problem, also fix the other stuff brad!