* re enable marketplace * better error handling * better error handling to go with it * fix error handler styles