Switched to unset for session variables, few other small changes