fixes
fixed lists evaluation
fixes and refac
functions added