Removed the rescanAll() method because it was pretty pointless. Also fixed some minor things.