fixed some things - oops, this is why you should test before push