Added gems and fixed a couple bugs