got some small glitches fixed