Some fixes in System handling, and beginning of a example demo (test/es)