Working through various bugs - comment formatting, creating new entries, etc