Final final fixes yay!!