fix a couple files, add normalize