corrected some functionality, moved methods and properties into new Signatures class for cleaner code