Fixed multiple bugs, added gems