003: task complete, minor improvements