fixed subtle bug, added more feedback