alternator syntax + some fixes #503 #603