minor changes, fixed stuff