just some cleanups and fixes