bugfixes
moar bugfixes :exclamation:  :bomb:  :lollipop: