Updated Manpage to a somewhat newer version and updated TODOS