reorganized some stuff, freed by semi-colon (for now)