a bunch of changes... :P