major update and stuff