fixing bug with session
mergin the plugins and code cleanup