rough cut fixes (all except centering)