Issues resolved

Issues 12, 13, 14, 16 and 17 resolved.