Minor bug fixes
Minor changes
Testing some functionality.