few minor touches, ready now