Edit some random bugs and make up