Added verification, fixed some bugs + tested out