in the midst again
tab fixes and some code too