Slight fixes and removed NetBean files