Various fixups. Hight priority.
Should fix #201 (closed) as message is already printed and this fixes error it raises.