small fixes and git stash added