updated a bunch o' stuff