completion and fixes