fixed many bags, added new features