bug fixes
improved log in