whoops...fixed some stuff with #108