tidied smartassv2 stuff
fixed conflicts