more changes 'n' stuff