Start addressing some of @jaalto's submitted issues.