Some small comments and fixes