minor changes
removed promise style api... again.. screw it