Various minor changes; worked a bit more on polish