Third commit - small changes and addons.
Small changes and addons.