Progressing on Comment implementation

Also some fixes here and there