Patch 1

Updated. Some polish.