Update some critical bugs + little changes/new features