Style and functional fixes

you did it again D: