adding start option & bug fixes
refactor and cleanup, demo update