presentation added, some bugs fixed