bunch of changes...