Re doing the specs
added more specs
Upgraded gems and fixed some search