Adding messages and some minor changes to other scripts