Minor fixes/new features