fixed some api bugs
commented out redundant section, comments cleanup
fixed some api issues so avo, one spike, any spike, wedge will work