added macro areas; fixed some minor problems