Fix command issues, add kinder error handling