Fixed small timing issues and pink envelope bug