Fixed bugs. Should be ready to go