minor fixes
new solutions added
merge changes