Fixed parse errors, nicer output