Gemspec updates, TODO added, factory modified