bunch of changes...
oh man, who knows