improved some xlock functionality