Add bundle, rake tasks and some changes