formatting, more magic constant extraction, readme updates