+ fixes to get laptop correctly setup