Fixed bugs - Works

Fixed Bugs totally works now