some clean up, removed some debug-hardcodes, ..still a lot of work to restructure and clean up...