added closures, simplified stuff

need to fix some closures.. they aren't working