-fixed multiple locker bug, but still some errors