README updated and cosmetical fixes
Include cleanup