Added upcoming, bug fixes