Added stream structs
fixed compilation problems
Fixed styling