feedback working, lots of cleaning in files