add capistrano and little bug fixes