add demo page, and some changes (This is just the beginning!)