* first part of bug cleansing commits, still not runnable