Final tweaks
Initial checkin