cleanup
fixed stuff