post-regression cleanup

Something broke when merging askmike's gekko, so it is necessary to re-merge these commits. 

(*Had to do a bisect and rebase by hand using CLI git interface to fix it*)