made bunch of changes