Fixed pub/priv issues
Added intristics
Fixups