remove scope
add some more macros for wiring