Some cleanup, translation, session patch