tested and fixed bugs for user