Updating Various bugs. Getting ready for presentation.