Mutiple component improvments (first functional version, non-tested)
Debug