Patch 2

General improvements.