Fixed parsing and some visuals