Fixed many bugs. Couple more to fix/add