fixed stuff, debugging more