More code
Fixed warnings in Netbeans