fixed many issues

new helper methods