Add rum and a few other classess. Fix some bugs