some minor fixes and synchronization between laptop and cluster