added some stuff (still unfinished)