* cleanups and fixes