soe
Ah.. more changes and cleanup