more fixes to get it running on laptop