first commit and add tweaks