minor bug fixes lol
Merge branch 'param-shell' of github.com:froj/nastya into param-shell