Fixed marker table
Enable loading of comments

Resolves #2