little cleanup
merge storage
merge magnids + protou -> bcm4330