* big commit, mainly cleanups: