Last commit ctd.

Must fix netbeans commits, doesn't include all files?!