initial commit
some tweaks