P04 solution and lint fixes.