adjusted to feedback and fixed some other glitches