removed the namespace
temp fix.
fixed some merge errors
some major fixes