first commit
fixups