Fixed all errors, get 1 warning, 1 remark