programmer grievance fixes #3

pull zahtev
Awesome job! Go ahead and merge this back into master.