Bug fixes!

It's been awhile!
Should close or at least improve the problems in issues
#122
#114
#84
#79