20140501-2318. cleanup lab1 a bit