stash
improve shit
fixes