removal of frivolous if-else conds, commented code
subtle tidyup
Merge branch 'bounding-box' into iss6