Fix spec failure, remove 'self'. where it shouldn't have been,  minor tweaks.