Fixes for p= and add 'fm' to move flags