general cleanup and a few additions