added lock y rotation, reorganized