more updates to make shit work right