clean up ivar and method names and fix dismiss bugs