Various additions, added more TODO notes (view action items in netbeans)