added more to waldorf.c