another bunch of changes :)