Minor implementations, comments and name fixes