Bugs Fixed

Streams close
Defines changed