Fixing all bugs