Fix things & various changes