small changes and junk