Corrected several positioning problems