Fix #14 Fix #5 Namespace/Order Cleanup