Justify the cause, also fix a couple of things