Updated getProperty -> getMessages. Other minor tweaks.