Big push of updates

Please pull this down before updating images and such