fixed activesupport dependency & some minor bugs