a bit of this a bit of that

superficial changes and some commenting added