Some minor fixes, some git cleanup, setting up for NetBeans