update error handling
update style