Aenario modifications + style fixes