overall project cleanup & bugfixing
overal project cleanup & bugfixing