queue love, updated basic types and declarations

Hey Andrew,

Did a heavy pass through queue for you. If you don't like any of the changes, no big deal.