Made constructors, fixes, saruman methods