bug fixes
better feedback