all initially planned features added, now fix compilation