fixing caps and stuff