project cleanup
bug fix