Updated version, tweaked more messages