several formatting improvements and angular fixes