fixed, debugging the rest