adding main things in base
wrap width added
merge errors fixed