Removed temporary files + various minor fixes