Added FixedOutputAdapter and cleaned some things up