fixed the session stuff, cleaned up.