Minor fixes & important "Simple" format parsing fix