more fine tuning. just headers missing right now. ace. refs #514