002: solution 2* minor fixes/cleanup