asthetic updates, some parsing logic