Clean up some code, and started working on some cloaks.