Added 501 not implemented and command line things