Finished implementing the terminal cliet/server command
Fixed misc errors