Fixed some half arsed changes. It was late and I was tired!