Fix up some naming and attribute loading issues
Add support for fortunes file