Fix typos
Fix arguments bug, error handling