removed act as commentable, added in new comment and specs
merged
Fixed merge conflicts