Fix small issues and add lock device to position