Updated upcoming plans and bug fixes