fixing compile errors and ACTUALLY pushing