have fixed many of the bug issuues