Added SMP parsing, fixed couple of errors