fixed the first bugs ... next tomorrow