added system.xml, some fixing