small fix
some cleanup
refactoring build (buggy)