Fixed couple of errors, does not work