Resolved the aliasing issues and other stuff.