94to99smallbugs

#91, #94, #95, #96, #97, #98, #99