* Added CSV Export and fixed a few bugs