making little fixes here and there as I continue testing