move bug fixes