Dimension Switch Added, few minor fixes too.