Fixed all the bugs......Finally ready for DEMO.