Continued to enhance functionality and bug fixing