Bug fixes, general syntax changes.