some more changes
fixed stuff