bug fixes
migrate to rails 4