random improvements
macro improvements