First checkin after registering all reported issues.