first commit
general fixes