cleaned up some stuff, now the work can begin