better error handling
rename
remove console logs, proper version