[nonnormal] some fixes and cleanup