Various fixes :p, I know I should add more info but hey :p