Fixed some varying issues with calsses and ids.