Fixed parsing, improved mans