windows/linux build break + addresses zappoman review comments