overall project cleanup & bugfixing