Added presentation. fixed bugs