removed error return var from unlock, updated Stop