formatting, hardcode fixes