syntax changed to "#@decor"; bug fixes; improvements