various commits and changes