Refinements

several improvements based on real-world usage of red egg in wsapi