Name corrections, some minor bug fixes