Dealt with the last few cases for server responses
Also fixed a few bugs that caused it to not actually work