fixed check in and check out bugs again