cleanups, improvements, fixes