update
minor update
error check, format changes