code cleanup+  landing fix