Added various goodies