Some general changes, ranging from error handling to aesthetics