Update docs and fixed minor bugs
Remove old gem