update middleman + few new tricks