Update and some fixes
Add simple_format