little changes
conflict fixes
add rake tasks