Adding more functionality.
Minor fixes