updated defaults, removed commented code