Touchups/Fixes.
Fixed: various errors
Started: adding contact features.
Touchups/Fixes