A few changes. Hopefully nothing is broken X_X