Fix #3, move basic help out, other small changes.