first commit
some tweaks
update