Fixed some formatting bugs, etc.