Fixing all these damnable bugs