Fixed most minor details