Move bug fixes, status error fixes

Move bug fixes, status error fixes