Minor Updates

Added some extra functionality.