Fixes based on jbuck's review