Huge update. Clean up. Do it at a time.

Signed-off-by: Aza <azaaza@gmail.com>