Split away inputs from base + ammended a few comments