small fixes to first commit