Clean up and fix some bugs. send and get castle units