Bug fixes and address comments from in person review with Brian