Also fixed some typos Also changed the panic a bit Removed changed to unnecessary files Fixed merge Feedback Fixed tests