New files
small bug fixes