Fix demos and add author info