Netbeans project, bug fix and improvements