Fixed some issues, added a few methods