easymotion plus general cleanup