Fixes and more functions including filter and map