Minor fixes

stuff that was bugging me