Bug fixes + project cleanup