minor stuff - still unfinished