fixes
start spec/fixing
renames and fixes
kinda of working
fixes
last fixes