fixes for Initial upload

fixes for small errors