little changes
ripped out irrelevant functions