bug fixes and rocket optimization