Some fixes but makes sure to check because most of the last changes were made directly into the server