Checkin before some final tweaks