bunch of fixes including adding Checkin ability (needs work)