updates & bug fixes, removing 'actions' for now so queries will work as intended