Added Interactive Mode; Fixed some bugs