Multiple changes: Issues fixed/nicer messages.