Clean up project and small fixes