Final Changes

final stuff