key mapping now session dependent and user mapping correctly loaded
minor fixes