Merged previous commit. Minor fixes/additions.