checkpoint
checkpoint
multiple small fixes