Added comments for all classes, cleaned up orderbook impl
Fixing merge conflicts