New files
minor bugs corrected
minor bugs corrected