Added non-functional Bot class. Minor cleanups