added some Astell, minor fixes