Fixed bugs and changed some features to match new numbers