Minor bug fix and improved help messages