fixed stuff finally