added build and cleanup. code style fixes, ready for release