Fixed the strange momentum bugs