Added several bug fixes for oct8demo epic story