fixed errors ingracenote
fixed error handling issues
fixed error handling issues
merged conflicts
fixed bugs
readme updateed