Fixes from force commit

forcing is bad, dontchaknow