fixed bugs, improved usability, updated display logic