Cleanup, FIXMEs, newly reverse-engineered architecture

@mkit