Reformat/rebuild and a few minor bug fixes
Removed netbeans project