comments and various fixes

space

some comments

adfsdsadfs

various fixes and comments
rebase with discore