rough improvements to move api and bot logic